Small cleanup

Searching the existing record instead of querying the database