Fix & polish code of SearchBundle