some requests moved to if-data + code improvements