Updated queries and EditDB page