Adds spaces search
Fix merge issues