[WIP] Edit form updates, validation and Solr changes