Cleaned up drafting, bug fix, added drafting to search output