several fixes for listing