split type search from function sig search
Split type search from function sig search. Closes #320

Merge remote-tracking branch 'origin/pr/320' into es