Felicitas advanced search mockups
improve the code