fixing to use splitted_query to perform AND search
Merge branch 'hotfix'