Added queries for filling Add/Edit page