Moved search from its own class into the DataAccess class