some refactoring on the #URL handlers, still not complete...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>