Pull Request: C1_Assuty_223_advanced_search_1.23

@KhaledHelmy @Serag8 @mohamed-elmahdi @AmirGeorge same as #221 in the setup no need to do it again.