fixing delegation queries and working on feature