Search was rewrited in separate module and was refacrtored