Feature/source from query