Bug fixes for getAll