Fix for not-found error for tags