adding debug url querys and some refactor