Callbacks are and always were gross.
Will need to implement these properly and nicely at some point.
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 2.3/develop
Added missing search.entry_type
Put entry_type in the wrong place.