Merge pull request #460 from anilgooru/dev-branch

Bugs fixes for 6.3 patch
clear filter on click of search button
Merge pull request #461 from nutan-gooru/dev-branch

clear filter on click of search button
Fixed : 500 error while playing collection from teach
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  clear filter on click of search button