Minor bug fixes<br />Temporary plugin to replace broken {cms_filepicker}