Better version of template locator hook

Includes the actual filter return, so the rest of the site doesn't
break, yay!