Fixing some bugs,
Added some search advancements