Cleaned up search modules