path and query fix
temporary workaround because of dllexport macros