remove undefined
added queries