Some frontend fixes for collections