Added currently accepted name field
Removed tmp query