polished create/edit, added keyword searches