Added location field to general question entity