Implemented "upgraded" search

Still lacking of power search