Fixes and revisions in Facebook search
Fix conflicts after merging MH-991 to dev