Changed search to use keywords if names null