Connecting correct search method and some other tweaks