More complex search logic to allow user name inclusion