fixed params to db queries
now adding context property to :AT