can now return stuff in query without having to use final containers