added search object support to this bitch