Cleaned up searching
Removed unneeded dirty flag for saving