Resolving bug and better interface for advanced search

Signed-off-by: Rousselle <kerousselle@gmail.com>