Search launched from site scope still starts in Repository scope

Search launched from site scope still starts in Repository scope

Steps to reproduce:
1- Log in to Share and create a file in "Repository" (e.g. "Repository" > "test1.txt)
2- Create a file with the same name in document library of a site (e.g. "site1" > document library > "test1.txt)
3- In the site (site1) search the file (test1)

Expected behaviour:
Search results will be constrained to that site. Therefore it only displays the file in that site.

Observed bahaviour:
Search results in the live search drop-down will be for the entire Repository not constrained to that site. Therefore it displays both files.

However the option to set the search for that particular site in advanced search page is available.

Analysis to date:

• This issue has been reproduced in Alfresco version 5.0.0.3, Solr4
• The default value for repository search configuration in share-config.xml is set to "always-options".
  Changing this value to "context" doesn't perform the search based on the current context:

<config evaluator="string-compare" condition="Search">
<search>
<!-- Repository search configuration option -->
<!--
The 'repository-search' config element value can be one of:
none - disable repository wide search option
context - search depending on current context, including repository, all sites, current site (default)
always - always search full repository no matter what the context, disables search context options
always-options - always search full repository no matter what the context, still shows the search context options
-->
<repository-search>context</repository-search>
</search>

Business case:
Its a very important criteria to have context search for the customer.
And in the meantime please advise if there is any quick fix for getting context search back