fix for empty string and callback params order