Improve CORS filter + add 'bookmark adding feature'