Bug fixes for listings