Code review comments + fix server.py

server.py:
        forks and parent_name in query_def confuse django.
        (this only happnes with the non-minimized verison. Worth
        investigating in the future?)