This Fixes #754,#755,#656,#828,#823

Including asstes also for search. I didn't know assets search is also included. 
@Arko2013 informed while testing this. Thanks.