Fixed directive and added search