Make search match commands too