Modify search to query multiple attributes