Fixed ui issue in search for FF
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #1148 from anilgooru/dev-branch

Fixed ui issue in search for FF