Added generic and individual search capability