Search block type and object picker

refs issues 1497, 1499, 1500