Refactored metadata to conform to proposed meta implementation
Refactored indexing to utilise new searchParams metadata