Removed static content and linked with location id