Altered search, added comments field