Fix no search on subject change regression