Removed OPTIONAL statements from count methods where possible