Refactored storage survey into view on index