Fix for workspaced versions of projects
Phone numbers to library
Follow-up patch for wrong SQL statement