fixed queryBuilder and search controller & model